Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Fri, 7 Jun 2013 13:55:28 +0000 (21:55 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Fri, 7 Jun 2013 13:55:28 +0000 (21:55 +0800)
commit305b512534a1572385c00545f43a1bdbf273aa23
tree801079b2ab5b4763b06ce27742893bc7205d04c1
parent47466a7c1c089decaddcf54ae2826f75219126b6
parent944fc03ea01d3d34f2a2a0410416584ebe5c942f
Merge from mainline.